Autogenerated HTML docs for v1.5.3-rc0-39-g46f7
diff --git a/git-clone.html b/git-clone.html index 93dece9..4c1dcde 100644 --- a/git-clone.html +++ b/git-clone.html
@@ -431,8 +431,9 @@ </dt> <dd> <p> - The (possibly remote) repository to clone from. It can - be any URL git-fetch supports. + The (possibly remote) repository to clone from. See the + <a href="#URLS">URLS</a> section below for more information on specifying + repositories. </p> </dd> <dt> @@ -449,6 +450,92 @@ </dd> </dl> </div> +<h2>GIT URLS<a id="URLS"></a></h2> +<div class="sectionbody"> +<p>One of the following notations can be used +to name the remote repository:</p> +<div class="exampleblock"> +<div class="exampleblock-content"> +<ul> +<li> +<p> +rsync://host.xz/path/to/repo.git/ +</p> +</li> +<li> +<p> +http://host.xz/path/to/repo.git/ +</p> +</li> +<li> +<p> +https://host.xz/path/to/repo.git/ +</p> +</li> +<li> +<p> +git://host.xz/path/to/repo.git/ +</p> +</li> +<li> +<p> +git://host.xz/~user/path/to/repo.git/ +</p> +</li> +<li> +<p> +ssh://[user@]host.xz/path/to/repo.git/ +</p> +</li> +<li> +<p> +ssh://[user@]host.xz/~user/path/to/repo.git/ +</p> +</li> +<li> +<p> +ssh://[user@]host.xz/~/path/to/repo.git +</p> +</li> +</ul> +</div></div> +<p>SSH is the default transport protocol. You can optionally specify +which user to log-in as, and an alternate, scp-like syntax is also +supported. Both syntaxes support username expansion, +as does the native git protocol. The following three are +identical to the last three above, respectively:</p> +<div class="exampleblock"> +<div class="exampleblock-content"> +<ul> +<li> +<p> +[user@]host.xz:/path/to/repo.git/ +</p> +</li> +<li> +<p> +[user@]host.xz:~user/path/to/repo.git/ +</p> +</li> +<li> +<p> +[user@]host.xz:path/to/repo.git +</p> +</li> +</ul> +</div></div> +<p>To sync with a local directory, use:</p> +<div class="exampleblock"> +<div class="exampleblock-content"> +<ul> +<li> +<p> +/path/to/repo.git/ +</p> +</li> +</ul> +</div></div> +</div> <h2>Examples</h2> <div class="sectionbody"> <dl> @@ -521,7 +608,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 16-Jun-2007 09:48:57 UTC +Last updated 06-Jul-2007 17:01:29 UTC </div> </div> </body>
diff --git a/git-clone.txt b/git-clone.txt index 4a5bab5..2f39864 100644 --- a/git-clone.txt +++ b/git-clone.txt
@@ -106,8 +106,9 @@ as patches. <repository>:: - The (possibly remote) repository to clone from. It can - be any URL git-fetch supports. + The (possibly remote) repository to clone from. See the + <<URLS,URLS>> section below for more information on specifying + repositories. <directory>:: The name of a new directory to clone into. The "humanish" @@ -116,6 +117,8 @@ for "host.xz:foo/.git"). Cloning into an existing directory is not allowed. +include::urls.txt[] + Examples --------
diff --git a/git-fetch.html b/git-fetch.html index 8ad8786..ec65721 100644 --- a/git-fetch.html +++ b/git-fetch.html
@@ -651,7 +651,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 16-Jun-2007 09:49:04 UTC +Last updated 06-Jul-2007 17:01:29 UTC </div> </div> </body>
diff --git a/git-fetch.txt b/git-fetch.txt index 5fbeab7..9003473 100644 --- a/git-fetch.txt +++ b/git-fetch.txt
@@ -35,7 +35,7 @@ include::pull-fetch-param.txt[] -include::urls.txt[] +include::urls-remotes.txt[] SEE ALSO --------
diff --git a/git-filter-branch.html b/git-filter-branch.html index 97f146b..555bb3e 100644 --- a/git-filter-branch.html +++ b/git-filter-branch.html
@@ -307,7 +307,8 @@ tmpfs. Reportedly the speedup is very noticeable.</p> <h3>Filters</h3> <p>The filters are applied in the order as listed below. The <command> -argument is always evaluated in shell using the <em>eval</em> command. +argument is always evaluated in shell using the <em>eval</em> command (with the +notable exception of the commit filter, for technical reasons). Prior to that, the $GIT_COMMIT environment variable will be set to contain the id of the commit being rewritten. Also, GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, GIT_AUTHOR_DATE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL, @@ -561,7 +562,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 05-Jul-2007 05:51:15 UTC +Last updated 06-Jul-2007 17:01:30 UTC </div> </div> </body>
diff --git a/git-filter-branch.txt b/git-filter-branch.txt index 219a81d..eaea82d 100644 --- a/git-filter-branch.txt +++ b/git-filter-branch.txt
@@ -50,7 +50,8 @@ ~~~~~~~ The filters are applied in the order as listed below. The <command> -argument is always evaluated in shell using the 'eval' command. +argument is always evaluated in shell using the 'eval' command (with the +notable exception of the commit filter, for technical reasons). Prior to that, the $GIT_COMMIT environment variable will be set to contain the id of the commit being rewritten. Also, GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, GIT_AUTHOR_DATE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL,
diff --git a/git-pull.html b/git-pull.html index 374eb3e..f4a5715 100644 --- a/git-pull.html +++ b/git-pull.html
@@ -896,7 +896,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 16-Jun-2007 09:49:15 UTC +Last updated 06-Jul-2007 17:01:31 UTC </div> </div> </body>
diff --git a/git-pull.txt b/git-pull.txt index 84693f8..e1eb2c1 100644 --- a/git-pull.txt +++ b/git-pull.txt
@@ -29,7 +29,7 @@ include::pull-fetch-param.txt[] -include::urls.txt[] +include::urls-remotes.txt[] include::merge-strategies.txt[]
diff --git a/git-push.html b/git-push.html index 52d860e..8446225 100644 --- a/git-push.html +++ b/git-push.html
@@ -589,7 +589,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 16-Jun-2007 09:49:16 UTC +Last updated 06-Jul-2007 17:01:31 UTC </div> </div> </body>
diff --git a/git-push.txt b/git-push.txt index 665f6dc..74a0da1 100644 --- a/git-push.txt +++ b/git-push.txt
@@ -95,7 +95,7 @@ -v:: Run verbosely. -include::urls.txt[] +include::urls-remotes.txt[] Examples
diff --git a/tutorial.html b/tutorial.html index 3fdd038..4528590 100644 --- a/tutorial.html +++ b/tutorial.html
@@ -563,7 +563,7 @@ <div class="listingblock"> <div class="content"> <pre><tt>$ git config --get remote.origin.url -/home/bob/myrepo</tt></pre> +/home/alice/project</tt></pre> </div></div> <p>(The complete configuration created by git-clone is visible using "git config -l", and the <a href="git-config.html">git-config(1)</a> man page @@ -786,7 +786,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 16-Jun-2007 09:49:28 UTC +Last updated 06-Jul-2007 17:01:32 UTC </div> </div> </body>
diff --git a/tutorial.txt b/tutorial.txt index 118ff72..53403c6 100644 --- a/tutorial.txt +++ b/tutorial.txt
@@ -354,7 +354,7 @@ ------------------------------------- $ git config --get remote.origin.url -/home/bob/myrepo +/home/alice/project ------------------------------------- (The complete configuration created by git-clone is visible using
diff --git a/urls-remotes.txt b/urls-remotes.txt new file mode 100644 index 0000000..5dd1f83 --- /dev/null +++ b/urls-remotes.txt
@@ -0,0 +1,55 @@ +include::urls.txt[] + +REMOTES +------- + +In addition to the above, as a short-hand, the name of a +file in `$GIT_DIR/remotes` directory can be given; the +named file should be in the following format: + +------------ + URL: one of the above URL format + Push: <refspec> + Pull: <refspec> + +------------ + +Then such a short-hand is specified in place of +<repository> without <refspec> parameters on the command +line, <refspec> specified on `Push:` lines or `Pull:` +lines are used for `git-push` and `git-fetch`/`git-pull`, +respectively. Multiple `Push:` and `Pull:` lines may +be specified for additional branch mappings. + +Or, equivalently, in the `$GIT_DIR/config` (note the use +of `fetch` instead of `Pull:`): + +------------ + [remote "<remote>"] + url = <url> + push = <refspec> + fetch = <refspec> + +------------ + +The name of a file in `$GIT_DIR/branches` directory can be +specified as an older notation short-hand; the named +file should contain a single line, a URL in one of the +above formats, optionally followed by a hash `#` and the +name of remote head (URL fragment notation). +`$GIT_DIR/branches/<remote>` file that stores a <url> +without the fragment is equivalent to have this in the +corresponding file in the `$GIT_DIR/remotes/` directory. + +------------ + URL: <url> + Pull: refs/heads/master:<remote> + +------------ + +while having `<url>#<head>` is equivalent to + +------------ + URL: <url> + Pull: refs/heads/<head>:<remote> +------------
diff --git a/urls.txt b/urls.txt index 745f967..781df41 100644 --- a/urls.txt +++ b/urls.txt
@@ -32,57 +32,3 @@ =============================================================== - /path/to/repo.git/ =============================================================== - -REMOTES -------- - -In addition to the above, as a short-hand, the name of a -file in `$GIT_DIR/remotes` directory can be given; the -named file should be in the following format: - ------------- - URL: one of the above URL format - Push: <refspec> - Pull: <refspec> - ------------- - -Then such a short-hand is specified in place of -<repository> without <refspec> parameters on the command -line, <refspec> specified on `Push:` lines or `Pull:` -lines are used for `git-push` and `git-fetch`/`git-pull`, -respectively. Multiple `Push:` and `Pull:` lines may -be specified for additional branch mappings. - -Or, equivalently, in the `$GIT_DIR/config` (note the use -of `fetch` instead of `Pull:`): - ------------- - [remote "<remote>"] - url = <url> - push = <refspec> - fetch = <refspec> - ------------- - -The name of a file in `$GIT_DIR/branches` directory can be -specified as an older notation short-hand; the named -file should contain a single line, a URL in one of the -above formats, optionally followed by a hash `#` and the -name of remote head (URL fragment notation). -`$GIT_DIR/branches/<remote>` file that stores a <url> -without the fragment is equivalent to have this in the -corresponding file in the `$GIT_DIR/remotes/` directory. - ------------- - URL: <url> - Pull: refs/heads/master:<remote> - ------------- - -while having `<url>#<head>` is equivalent to - ------------- - URL: <url> - Pull: refs/heads/<head>:<remote> -------------
